Shut up gcc AND cvs

-Yosh

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 2c9959501e27faa8e94761b530b4824ca656a22e..d02010b697d46a2a1b061f7a62a9b6c830efe506 100644 (file)
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -20,3 +20,4 @@ gtkmarshal.c
 gtktypebuiltins_ids.c
 gtktypebuiltins_vars.c
 gtktypebuiltins_evals.c
+gtk.defs

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index fff42c7cb1fffa73d6e25d8af6220081e5712740..b07d953ae2095c5e565a76c9056185a84ac5d019 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1293,13 +1293,11 @@ gtk_color_selection_eval_wheel (gint     x,  gint     y,
                                gdouble  cx, gdouble  cy,
                                gdouble *h,  gdouble *s)
 {
-  gdouble d, r, rx, ry, l;
+  gdouble r, rx, ry;
 
   rx = ((gdouble) x - cx);
   ry = ((gdouble) y - cy);
 
-  d = (SQR (cy) * SQR (rx) + SQR (cx) * SQR (ry) - SQR (cx) * SQR (cy));
-
   rx = rx/cx;
   ry = ry/cy;
 
@@ -1316,11 +1314,11 @@ gtk_color_selection_eval_wheel (gint     x,  gint     y,
   if (*s == 0.0)
     *s = 0.00001;
   else if (*s > 1.0)
-  {
-    *s = 1.0;
-    return 1;
-  }
-  return 0;
+    {
+      *s = 1.0;
+      return TRUE;
+    }
+  return FALSE;
 }
 
 static void